First refactoring. Searching and creation working. Stil a lot of work to do.