This a bit better of a way to do this.  However, I still want a better solution