Fix specs
Start reworking features