Lots of changes v0.1