Initial work on changing to DataPackets for online mode