Updated module to function independently, began messing with categorical calculations (need more work