Lots of progress this week, hoping to be finished early next week