WIP: Make OOPP work

Because previously it didn't.