Adding specs and features, continuing work