second commit. A bunch of stuff changed