Initial checkin of realtime (WIP), and various updates
Merge