A handful of changes since last time; figure out better version workflow