Updates to the codebreaker, still need to create the correct marker class