Tests passing .. move on, basic design is done