refs #4996 handle interactions better / correct. Code not tested at all yet. Gonna write some tests