halfway through changing basics
Merge branch 'master' into goodness
Stopped lying about two phases
Merge pull request #5 from clottman/goodness

Goodness