Made some progress

progress