Moved to GMM framework, major changes afoot...