Working better version control into it all