Few more things to do to enhance, but yeah its getting there