Almost ready for test, just a handful of bugs to weed out