Refactor

This is an ongoing process pulling everything together.