Yup, spliting up basically made the logic *slightly* less ugly.