refactoring - does not compile .... yet