GUNO: Refactoring some of the code. Needing a more unified interface.