Pushing some dodgy changes, will review for 0.0.1 later on