Added example locations and cleaned up controller code.