initial push
clean up