Starting to make transition to delegation

Slow and steady prevents code implosion.....