replacing Block.estate with estate_id
added scaffold for units