Switched template function to just use statics for now for testing