catching up doco and resolving classes