Added a lot, incorporated listener into main class