4/27 full updated design
4/27 fixed merge conflict?