Finish porting things over to props instead of listenTo