added import handling for notes
start handling extra fields