Ahh! That seems to be much nicer than the current implementation! :)