blah
better stop
stuff
Bullets working
Finished merge Josh->peter