Added todo for civ-web
Refactored