Added button and button processor, but didn't debug that
Fixed some errors
Merged two branches