Moving towards #16
Working towards a fully moving cursor. Fixes #16