Added feature sets from #3

Added feature sets from #3 and some features from #2