Adding some math and todos