Moved variable stuff out of calculator. Working.