Replaced storing functions to render to multimethods to make things more transparent

This P-R is as per #7