huge refactoring of data layer, added empty administration area and