Major work with refractoring and making sure it is ready for implementation.