temp commit
Part way through Dynamo refactor