Started working on parsing other input data sources