WIP
wip
wip
Merge pull request #1 from rocha/base

WIP Base implementation