second commit - work so far.

Signed-off-by: Joshua Paling <joshua.paling@gmail.com>