added toDo comments, macros, started outlining functions