GUNO: Added some refactorings/things that need research.