Wow great job on this. I spent some time on the previous iteration and this is much cleaner.