I'll start working on a CS after you make your additions