Moved some code over to new Master node