Updates

Only got to push a bit of progress over the weekend, due to work.

I will try to make more progress today