This is a somehow working version. Problems with goalPlus() and goalMinus(). Also saving does weird things. Probably related with goalPlus() and goalMinus().