Added fields for filtering
Added the scripts files
Still working on filtering