Fixed up enough to pass tests
Simplify blueprint