Begin the strip-down and revamp.  Currently will not compile