Split back out to dynamic/static, needed an option tweak for static