all done, will do some cleanup later tonight