Refactored back out of static-lib (submodules are a pain)