Reworking the original SPA jukebox in C++