some more? More like SO MUCH. But really there was a lot of refactoring that went on in this branch. It's a lot easier to understand now and use in other places