Final commit for testing; now for a bunch of cleanup