Working on getting R1 functionality again also funny bug
Merge branch 'master' of https://github.com/Ourobor/petulant-batman