reorganized a bit more to make it look more like a real puppet setup