Add and drop functionality now in place

NOTE: Very basic, probably error prone, also ugly, but WORKING