Me not sure what approach to take, need to check. 

Can we merge this for now, will soon add the else part for sure. :)