Added basic support for push/pull - work still needed