Updated what is implemented/ what is left