Lots of changesgit add main.hs Display.hs Calc.hs groups/!