Fixed missing properties bug.
checking vagrant back in. Work towards multiple data sources.
Multiple data sources & Data source types & random data source complete.