added setup
Updated to JSON-based config
Updated setup