giant commit with all sorts of interesting stuff