City class early stages
Merge remote-tracking branch 'origin/master'
Owen's basic stuffs