Some refactorings... other progress