Switch to 'bind' format
Start cleaning up tests.
Begin breaking utils into separate files
Break utils into separate modules
Begin fixing tests
Fix remaining tests