I'll just leave this view as is because I know you have a better version of this in your branch.