Design Wave 1

Design Wave 1, initial commit, Aug 29