Initial work at live status updating
resolve merge conflicts