Worked on my calculator a bit more. It needs a lot of cleaning up though.