Format options and initial testing

**NOTE** This PR is built on top of PR #4