Use this from here on out

All: this branch works, WorkingSolution is our new "master"