First pass for Issa #324

First try here.. Let me know if I'm doing this correctly.