Game works again, finally.
[Broken] towards better object model