mass refactoriing into blueprints