This appears to be working

but I'm probably about to break it again as I continue developing. Enjoy it while you can!
@mariogiov are you against += syntax :-D