Finised coding.  Need to test