Finished first working version and ran simple integration test