Everything implemented.  Now testing