mostly working now, ready to destroy a bunch of test code