Implementation Prep

Just some tweaks in preparation of implementation.
Implementation Complete

Now to wait for the bugs to surface!