Started working on 100% coverage