Updates based on work performed today.

This is what I came up with based on testing and refinement from a little bit of research I performed. Hope you like it.