Feature specs

Ready to merge.