#13 Starting new design implementation