TODO list completed except for regression testing