Code organization bugs me :3