Temp commit. Implementing new desing.