cleaning up guesser, adding tests. WIP