0.12

temp working version finished