Completed

Design work as discussed