Completed all of the functionality I think. Did some rudimentary bugfixing, but need to get a full debugger up and running.