yes, forgot to cover this part, it's definitely not very readable, I'll clean this up.