Added TODO
Cleaned up prints, need to add logging