[MOD] Refactored further. Need to overlook some of the old methods again
e.g. datareceived() in the manager.