Final working peice
Final working commit