It is a work in progress...

primarily UI changes and fiddling