Added all

Some things should be deleted afterwards