Initial work

Yep, I can do a bit of testing and see. Can't hurt.