some initial refactoring; 1st test!