Finished features for version 0.1