finished all but 2 TODOs and added line to main