Big rework. v0.1.1