Building extension (18/26)

Building extension