GH-50 Refactor, and add Asteroid stubs
Merge branch 'master' of github.com:v4nz666/hairy-robot