SQUASH ME: Misc syntax changes and finish getting haystack % contacted back
SQUASH ME: Rip out a bunch of now unused serialization stuff
SQUASH ME: Got classification loop working again and inserting into db
SQUASH ME: Some unit test changes