Almost done implement real user kick, some more work pending