Adds more TODO notes and re-orders some stuff