Reverted to 100% delgation based.
Got basic proto delgation working.