Complete restructure - realtime is broken