added some things TODO