Added some base modules, added hooks, sorta