Some class structure.
Oops
Here's the missing commit -_-