More work on the Ninja pieces, can now build Ninja itself