Ok! Made this even more hackity. :-/