Ripped out most everything & added Module::Runtime