Almost done, add new and tests NOT solved