Started work on entity menus