revamp of some of the basefiles to build in zero and first