added lots of todos and my first initial
changed var names