0.5 rewritting

Closes #5