Some comments containing todo's. Meh