Removed code from main, changing to action/listener driven. Also added methods to other classes