Changed a few things. Not ready to commit.