General merge
Life all set
GUI sketched