More work on capturing.
Still not completely working, but getting there.