retooled some pieces, capture logic half done