Re:Made a little progress...