cleaned up base and added file upload to city