better structure and aargh QT test wiuth mulitiple files needs weird hacks for at test suite. So far one test file