Add rest of original source

Signed-off-by: Dan Mick <dan.mick@gmail.com>