Initial commit of large overhaul for design revision