more progress on all-the-way buttons part II