Done for the night -- All is working w/ new buffer method