Less, but better design.

Kanso hasn't added any work yet