More work done on the base concept of the site