Added dragging to 4year plan things. Serialization to come.
Merge remote-tracking branch 'origin/master'