Comments from dr nag

Bold idea, safety first though