Everything appears to work.. time to setup tests for datamapper and run regression tests