Police station added to city hall proposal