Basic concept finished. Now for some tune-ups