Merge development into master

Code is basically working, writing has started, I want to see the little green squares pop up correctly.