yeah, @houndci. I know, refactoring needed ;)