So I finally refactored everyting into multiple classes in my branch. It's either a drastic improvement or a drastic disaster.

While everything is now separated into 4 classes located in a single file, they could technically e separated into 4 files now :-).

original version
my version

Not official, and I may end up scrapping it, but I thought I'd see what everyone else thought.