work in progress
Merge branch 'skavish/bounds' of github.com:Animatron/player into skavish/bounds
work in progress