OAM sucks

In other news, WHY AM I COMMITING CODE AT 6 AM
Merge branch 'master' of https://github.com/awilfox/supergameherm