Seems like you are on right path