Removed test code mostly
First okayish version. Stable + dev v0.0.004a