#8 added categories. Still missing sorting movements by category