Dev 1.0

Done! :dancers: