Fixed Code

Had some errors to fix for my example tests and change some of the code
i think will better work for what I am looking for.