reworked a bunch of stuff for basic trove testing
added more stuff for testing functionality
reset to master