Yet again changed how buffers are handled, and added some code for user lists