Code Cleanup and added Test button to help figure out the sudo su and su mess.