Almost done
Signed-off-by: Andrew Lemay <alemay@redhat.com>