Closes #85. Everything should be out (and replaced) now.