second commit, part two complete (mostly)