code changes to handle new requirements from professor. Changes to dragoon files yet to be committed