dev_1.0

Ok mam. I'm done changing it.