Work on master API and node basic implementation

Still some work to be done