Redo everything from scratch and add test run-through. Much cleaner.