lots of stuff i forgot to commit.