* Major rewrite of multiple files - first steps to make the setup consistent with my coding style and comfort level... more to come...