Refactored. Added hooks for the mnu