Finished
More testing