Started Flake8ing
Added TODO