Refactored some of the roles and finished a test script for a basic game