Reorganized and merged Sam's changes
-Frankie