Changed section names. Added some todos. Now over to Isaac for a bit.