Beginning of refactoring fortress to make more sense.