Completed the other TODO. (buffer) Should be ready for debug.