Coding and updated design doc