Intermediate commit. Moosifying most classes for type checking