Cleaning up TODOs
Filling out headers test