Added some building base code