#39: Implemented a little more math