SQlite part done
merge with origin