Started adding more to change listeners, but there's big problems