Merge from apartment_complex_monument Was easier than merging from main as this branch contains an earlier merge from apartments