Don't have a clue what happened

Classes got deleted from this branch, committing so that I can pull the
new stuff back down.