major structural overhaul, finally squashed the capital capturing bug