WIP: fix blueprints