Still preparing for buttons and removing noob stuff