First commit. Still has lots of debug code