Refactoring
More refactoring, got keyboard stuff working better
More refactoring
Some more refacoting