New stuff
Merged Simon's changes, fixed a couple bugs
Let's try that again