Came back to master and did some work