resturctured arch, debug buttons added
insignificant changes
merge