architecture rewrite - broke hand and fish movement