Looks like youre on the right path with your planning not much I would change personally