Done some more work towards goal