Major update
Single line editing (^) now works! It's not clean yet though