Start cleaning up and consolidating code
initial commits
clean up code