Implemented more of the core mod.  Still non working.