I am going to sleep on the code now and will push it after reading it in the morning - clearly i have become lax.