Begin almost complete re-do :/