making progress on Blueprints model wrappers