Almost finished with refactoring
Network side is just about complete
need to implement OS side of things