Added more specs and renamed some of the ideas