Huge update, ready for v0.1