Finished make-puzzle. Refactored a little.
Added the beginnings of a GUI