Working

Need to add tests