Reshape socket communication and calls to entity buffer
Tidy up entity buffer a bit more, try and make requests more streamlined