-Finished adding button methods and organizing not yet implemented button methods