More features included, getting closer to merging with 0.1-beta