Basically v0.5 done