City 7/8 Update (Architecture + Basic Content + Energy Fix)