Pull Changes 10/26/14

Updating what I've done so far...