Pulled Oct. 30th Commits

Pulled Conar's changes from Oct. 30th