Close to complete solution so far