Cleaned up a lot of the module selection code, added Combat module.