Adding contents and buffer
fixing stuff and things
I officially have no idea what I'm doing