Latest Update

Still fighting through some schema.xml issues.