Refactored blueprint once again, to repo