Work in progress and updated network core