made some design amends from Jason's feedback