Yep, and I've got them both in there -- update coming shortly!