Build is broken, but it's the start of subclassing refactors