Yea, it's probably better to not do the overhead until more than one line of code is using it anyway. Anything else or OK to merge?