move to common class
add building class
temp