Changes w/Jon

Signed-off-by: Chad Allen <chad@awsmlabs.com>