Started working on command handler