Major Update1

Merged two builds. Loaded new images.