Wraps up 0.0.3, finishes issue #3 and is a start on issue #4