Testing and refactoring wanted!