all the basic functionallity is now present. Missing bonus, cleaning up and making everything pretier