Committing draft 2: 3/4 buttons working