Everything working
Various changes, tagging 0.1