Fixed issue where all entries weren't grabbed.
Finished addressing TODOs.