Restructured everything, restored keyboard

Decided I didn't like the way things were structures so I redid most
everything. Restored the keyboard, but there's a lot of temp/placeholder
stuff that I couldn't clean up before heading to work