more correct implimentation that still pisses me off
Merge branch 'master' of https://github.com/SwiftSpear/BnE431