WIP: nearing a full solution!