Been making headway, hoping to finish this weekend