Feature/dragndrop ordering

Still need to figure out how to test this adequately.