Initial work on adding requested features

Signed-off-by: Jason Myers <jason@jasonamyers.com>