yep we were thinking of this too

We'll try to have something cleaner today