I opted not to as this seemed like less code to write, but if you think it would be better let me know and I can implement it.