Final edit

For tonight anyway. I will get back to it later and attempt to commit
less so as there is less clutter.