Fixed imports, tests passing, shift key haandled more or less correctly