I think this will make things easier to work with overall Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>