don't know where i left off last commit, but i did a lot more...