It sounds to me like you're well on the right track, and a lot farther down it than many others.