working on specs
solved merge conflicts