Feature/better devops

WIP - Just FYI.  Should be done soon.