Multi-Line typing support

Still not fully functional, but the basis for multi-line typing support is all there.