Added buffer loader - cleaned up scaffold code