Use built-in mechanism for auto-adding buffers to current workspace, rather than reinvent the wheel.
Easier to organize and write. Now I can hopefully strive for better coverage!