More work going in to 0.3dev. There is a lot, I am not doing small commits at the moment as this is work on the train. Most files have changes due to clean ups in the code. The layout of the code may also change to make it more logical. See diff for details