Initial proof of concept, needs extension base support for Returns