Import Edit & Query Edit

Finishes Import (For Now...)