Pushing working code before clearing up code and moving things around