Work in Progress

Makes sense! I'll remove the buffering then