Mom 81 ci

Sorry Nic, forgot to put 81 on the front of a couple of the commits. Feel free to squash them all into one if you want.