WIP new statics
Updated static helper to work slightly better