More rearranging functions, taking out old commented out code, commenting out some tests, etc.