Just progress update

Much more cleaning done.
Getting closer!