add form elements and TODO's [related #2]