Ongoing work

This work was completed a long time ago and never committed/saved.
Committing now, may need to be revewed/reworked if this project is
ever picked up again.