A bunch of additions, haven't committed in a long time