Fixed structure, added TODO, Just got things started.