Add TODOs for later
Add TODO
Switch from using ints to doubles