review comments

This is all i could do on my lunch break :( i am very excited about the changes you guys made
moved this into a util function. Util is getting too big, i need to break it up.