del merge dev - it's done. added more todos