Document system dev stage 2