Third commit

Almost done v0.1