Started to merge design into existing code