initial commit, removed dependencies on maps
clean up