Cleaned up aliases and class fn's. Moved old stuff to new 'previous' file