Agreed, hopefully someone else has a better idea