Started with migration to command pattern, added listener for network events