Semi-completion of the status work. Needs testing in the real environment.