dev_1.0

DONE! But still looking for some unused code.