Added drag and drop functionality, still working on time