Added console debugging, some calculate methods