Last commit before push

The code _really_ needs rework...