Initial checkin of 4.0.0 with some new menu choices