+1 first we should get features running to emphasize the power of this tool. I see also quite a few positions in the code which should be refactored and I think it will be not too late when the next PRs are accepted as they are. Maybe we also get to know how the code should be refactored not before some more PRs are merged.