I've done some work

See the final function/Button or two.