started adding menu support