commit a lot of stuff from last week