wip commit, lots to clean up