Continuing work on strip down.
https://github.com/WebSharks/Core/issues/2