Continue refacto code to include new sites... #1.