Fixed changes
Started with Testing approach no I've figured out some more stuff, so back filling functions already written