added corner case
updated todo
added connect layout