Finished up and removed TODOs