Changing drag and drop to work with what were aiming for. Needs a bit of clean up.