refactoring broke somthing... back to working I think.. writing tests
cleaning up commit...