second commit, need to finish tomorrow