Much update, big feature!

Signed-off-by: Joe Whipple <jwhipple@kemba.org>