See attached for the current state