adding jason's functionality files and changing logic to include it