MAde some progress on my work