Added some progress, not quite there though