will fix.  Eventually I think these may become classes but for now you are right.