Bunch of stuff...need to commit more often.