Updated introduction and left some TODO notes