Added some logic flows, will integrate.