second commit
nearly all done