dev_1.0

DONE!