First commit. New design