tp2 almost done :)