Nearly ready for dev2! :roller_coaster: