Total redesing first commit