Develop niek commandrefactor

Merging now so that I don't do too much in one branch.