Finished refactoring and Done of story 18 and 19. henrik Karl