merged Bill's and my work from yesterday
merged Bill's and my work from yesterday

jvd10/apollo,ApolloDev/apollo,ApolloDev/apollo,ApolloDev/apollo,ApolloDev/apollo,jvd10/apollo,jvd10/apollo,jvd10/apollo