second commit, with comments and ready for deployment