Cleaned up comments, commented out code that is broken at the moment.
Test update.