Added TODOs and misc files