completed tasks operational

completed tasks operational; another commit with having attempted to resolve merge conflicts