There, progress!
Some cleanups... (WIP)
More cleanups (WIP)
Okay, that should do it...