Implemented containerST buffer
cleaning up endpoint
cleaned up recent changes so that Endpoint would compile