Updated more concepts, working on networking