Ok, new patch series!  Broke up all the dependencies!

This might need a little work still but it's closer...