First working version of add/remove assets