Cityscape Lab Final Commit

This is guaranteed to be the last cityscape lab commit to github.
Fingers crossed for an A+.