Reviewed code, added some TODOs