Implemented calculation logic, cleaned up, tinkered with the design a bit.