Add session, sockets, and restructure :o