Start reimplementing

Most of the code is now commented out...