added in main, json parsing, etc, etc, take a look
merged