Revert "Revert "More solutions""

This reverts commit fd794e11c3aa83e9e874f7adecf3ed953ee186e8.