everything works/Final commit