added todos and chnged filepath