Making progress, partials working, now time to start cleaning up and using them.