pretty much done, going to submit tomorrow night