Resolved some TODOs
Git went full retard