\Forgot to commit changes to g-caluclator