Renamed - new_base
Added - menu templating (WiP)