Added drop targets. Refactored location of drag logic.