Updated for Keepalo

Changed from straight object processing to functions as event sources.
Add/remove updated to work as fast as possible with functions only.