Restructure to just 'Push' and 'Pull'