Merge pull request #25 from jonezy/master

Getting all the data for the features window prepped.