Commit so I can pull Dustin's changes.
Resolved merge issue.
Lets try this again...