Remove much of the code.
Removing more code.
Get a working test in.