Small victories in many aspects. More to come.
Reverted to inheritance.