Partial implementation of menu items - need to finish