Initial steps towards redesign
Complete redesign