Most Messagehandlers in place, still updates needed