Big update, lots changed.
commit, whatevs