It all works. Cleaned up some unused code.