Adding drag and drop; other things #terriblecommitmessages