Refactor storage. Add primitive movement collection and drawing