diff --git a/src/basic-languages/qsharp/qsharp.test.ts b/src/basic-languages/qsharp/qsharp.test.ts
index c288906792..e6abc780c4 100644
--- a/src/basic-languages/qsharp/qsharp.test.ts
+++ b/src/basic-languages/qsharp/qsharp.test.ts
@@ -6,7 +6,6 @@
 import { testTokenization } from '../test/testRunner';
 
 testTokenization('qsharp', [
-	// Generated from sample: https://github.com/microsoft/Quantum/blob/main/samples/azure-quantum/parallel-qrng/ParallelQrng.ipynb
 	[
 		{
 			line: 'open Microsoft.Quantum.Arrays;',
@@ -21,19 +20,6 @@ testTokenization('qsharp', [
 				{ startIndex: 29, type: 'delimiter.qsharp' }
 			]
 		},
-		{
-			line: 'open Microsoft.Quantum.Measurement;',
-			tokens: [
-				{ startIndex: 0, type: 'keyword.open.qsharp' },
-				{ startIndex: 4, type: 'white.qsharp' },
-				{ startIndex: 5, type: 'namespace.qsharp' },
-				{ startIndex: 14, type: 'delimiter.qsharp' },
-				{ startIndex: 15, type: 'namespace.qsharp' },
-				{ startIndex: 22, type: 'delimiter.qsharp' },
-				{ startIndex: 23, type: 'namespace.qsharp' },
-				{ startIndex: 34, type: 'delimiter.qsharp' }
-			]
-		},
 		{
 			line: '',
 			tokens: []
@@ -67,20 +53,6 @@ testTokenization('qsharp', [
 				{ startIndex: 1, type: 'comment.qsharp' }
 			]
 		},
-		{
-			line: '	// superposition state, such that when we measure,',
-			tokens: [
-				{ startIndex: 0, type: 'white.qsharp' },
-				{ startIndex: 1, type: 'comment.qsharp' }
-			]
-		},
-		{
-			line: '	// all bitstrings occur with equal probability.',
-			tokens: [
-				{ startIndex: 0, type: 'white.qsharp' },
-				{ startIndex: 1, type: 'comment.qsharp' }
-			]
-		},
 		{
 			line: '	use register = Qubit[nQubits] {',
 			tokens: [
@@ -99,13 +71,6 @@ testTokenization('qsharp', [
 				{ startIndex: 31, type: 'delimiter.curly.qsharp' }
 			]
 		},
-		{
-			line: '		// Set qubits in superposition.',
-			tokens: [
-				{ startIndex: 0, type: 'white.qsharp' },
-				{ startIndex: 2, type: 'comment.qsharp' }
-			]
-		},
 		{
 			line: '		ApplyToEachA(H, register);',
 			tokens: [
@@ -120,17 +85,6 @@ testTokenization('qsharp', [
 				{ startIndex: 27, type: 'delimiter.qsharp' }
 			]
 		},
-		{
-			line: '',
-			tokens: []
-		},
-		{
-			line: '		// Measure all qubits and return.',
-			tokens: [
-				{ startIndex: 0, type: 'white.qsharp' },
-				{ startIndex: 2, type: 'comment.qsharp' }
-			]
-		},
 		{
 			line: '		return ForEach(MResetZ, register);',
 			tokens: [
@@ -157,6 +111,76 @@ testTokenization('qsharp', [
 		{
 			line: '}',
 			tokens: [{ startIndex: 0, type: 'delimiter.curly.qsharp' }]
+		},
+		{
+			line: 'struct Foo { First : Int, Second : Int }',
+			tokens: [
+				{ startIndex: 0, type: 'keyword.qsharp' },
+				{ startIndex: 6, type: 'white.qsharp' },
+				{ startIndex: 7, type: 'identifier.qsharp' },
+				{ startIndex: 10, type: 'white.qsharp' },
+				{ startIndex: 11, type: 'delimiter.curly.qsharp' },
+				{ startIndex: 12, type: 'white.qsharp' },
+				{ startIndex: 13, type: 'identifier.qsharp' },
+				{ startIndex: 18, type: 'white.qsharp' },
+				{ startIndex: 19, type: 'operator.qsharp' },
+				{ startIndex: 20, type: 'white.qsharp' },
+				{ startIndex: 21, type: 'type.qsharp' },
+				{ startIndex: 24, type: 'delimiter.qsharp' },
+				{ startIndex: 25, type: 'white.qsharp' },
+				{ startIndex: 26, type: 'identifier.qsharp' },
+				{ startIndex: 32, type: 'white.qsharp' },
+				{ startIndex: 33, type: 'operator.qsharp' },
+				{ startIndex: 34, type: 'white.qsharp' },
+				{ startIndex: 35, type: 'type.qsharp' },
+				{ startIndex: 38, type: 'white.qsharp' },
+				{ startIndex: 39, type: 'delimiter.curly.qsharp' }
+			]
+		},
+		{
+			line: 'Foo.First',
+			tokens: [
+				{ startIndex: 0, type: 'identifier.qsharp' },
+				{ startIndex: 3, type: 'operator.qsharp' },
+				{ startIndex: 4, type: 'identifier.qsharp' }
+			]
+		},
+		{
+			line: 'import Microsoft.Quantum.Math, Microsoft.Quantum.Diagnostics.*;',
+			tokens: [
+				{ startIndex: 0, type: 'keyword.import.qsharp' },
+				{ startIndex: 6, type: 'white.qsharp' },
+				{ startIndex: 7, type: 'namespace.qsharp' },
+				{ startIndex: 16, type: 'delimiter.qsharp' },
+				{ startIndex: 17, type: 'namespace.qsharp' },
+				{ startIndex: 24, type: 'delimiter.qsharp' },
+				{ startIndex: 25, type: 'identifier.qsharp' },
+				{ startIndex: 29, type: 'delimiter.qsharp' },
+				{ startIndex: 30, type: 'white.qsharp' },
+				{ startIndex: 31, type: 'namespace.qsharp' },
+				{ startIndex: 40, type: 'delimiter.qsharp' },
+				{ startIndex: 41, type: 'namespace.qsharp' },
+				{ startIndex: 48, type: 'delimiter.qsharp' },
+				{ startIndex: 49, type: 'namespace.qsharp' },
+				{ startIndex: 60, type: 'delimiter.qsharp' },
+				{ startIndex: 61, type: 'wildcard.qsharp' },
+				{ startIndex: 62, type: 'delimiter.qsharp' }
+			]
+		},
+		{
+			line: 'export A, B, C;',
+			tokens: [
+				{ startIndex: 0, type: 'keyword.qsharp' },
+				{ startIndex: 6, type: 'white.qsharp' },
+				{ startIndex: 7, type: 'identifier.qsharp' },
+				{ startIndex: 8, type: 'delimiter.qsharp' },
+				{ startIndex: 9, type: 'white.qsharp' },
+				{ startIndex: 10, type: 'identifier.qsharp' },
+				{ startIndex: 11, type: 'delimiter.qsharp' },
+				{ startIndex: 12, type: 'white.qsharp' },
+				{ startIndex: 13, type: 'identifier.qsharp' },
+				{ startIndex: 14, type: 'delimiter.qsharp' }
+			]
 		}
 	]
 ]);
diff --git a/src/basic-languages/qsharp/qsharp.ts b/src/basic-languages/qsharp/qsharp.ts
index f89f44379b..1c12de23b2 100644
--- a/src/basic-languages/qsharp/qsharp.ts
+++ b/src/basic-languages/qsharp/qsharp.ts
@@ -33,12 +33,15 @@ export const language = <languages.IMonarchLanguage>{
 	keywords: [
 		'namespace',
 		'open',
+		'import',
+		'export',
 		'as',
 		'operation',
 		'function',
 		'body',
 		'adjoint',
 		'newtype',
+		'struct',
 		'controlled',
 		'if',
 		'elif',
@@ -141,7 +144,6 @@ export const language = <languages.IMonarchLanguage>{
 		'stackalloc',
 		'static',
 		'string',
-		'struct',
 		'switch',
 		'this',
 		'throw',
@@ -202,6 +204,7 @@ export const language = <languages.IMonarchLanguage>{
 		'^=',
 		':',
 		'::',
+		'.',
 		'..',
 		'==',
 		'...',
@@ -241,6 +244,8 @@ export const language = <languages.IMonarchLanguage>{
 
 	namespaceFollows: ['namespace', 'open'],
 
+	importsFollows: ['import'],
+
 	symbols: /[=><!~?:&|+\-*\/\^%@._]+/,
 
 	escapes: /\\[\s\S]/,
@@ -257,6 +262,10 @@ export const language = <languages.IMonarchLanguage>{
 							token: 'keyword.$0',
 							next: '@namespace'
 						},
+						'@importsFollows': {
+							token: 'keyword.$0',
+							next: '@imports'
+						},
 						'@typeKeywords': 'type',
 						'@keywords': 'keyword',
 						'@constants': 'constant',
@@ -282,7 +291,7 @@ export const language = <languages.IMonarchLanguage>{
 			[/[;,.]/, 'delimiter'],
 
 			// strings
-			//[/"([^"\\]|\\.)*$/, 'string.invalid' ],  // non-teminated string
+			//[/"([^"\\]|\\.)*$/, 'string.invalid' ],  // non-terminated string
 			[/"/, { token: 'string.quote', bracket: '@open', next: '@string' }]
 		],
 
@@ -295,7 +304,16 @@ export const language = <languages.IMonarchLanguage>{
 		namespace: [
 			{ include: '@whitespace' },
 			[/[A-Za-z]\w*/, 'namespace'],
-			[/[\.=]/, 'delimiter'],
+			[/[\.]/, 'delimiter'],
+			['', '', '@pop']
+		],
+
+		imports: [
+			{ include: '@whitespace' },
+			[/[A-Za-z]\w*(?=\.)/, 'namespace'],
+			[/[A-Za-z]\w*/, 'identifier'],
+			[/\*/, 'wildcard'],
+			[/[\.,]/, 'delimiter'],
 			['', '', '@pop']
 		],