Yes on the right track :)