changed TODO, added goals