1st Pass at Adding Button Handling