Added most methods

TODO: finish addToBuffer() method