Ok. If possible it would be nice to separate some of this stuff into separate PRs.