Manual merge with Lalit's files. Have some Menus and things.