changes to bullet system, need to extract files to separate classes