Staring to add a buffer model to try doing some TDD.