WIP: Currently on production #177

Open
trentlarson wants to merge 8 commits from master-patch into master