Done...a few more look and feel tweaks and it'll be ready for the job