Progress on moving over to decorators. #10