New design

Major pull for current implementation.