Committed functionality for version 0.1.