Finished Implementation, Now testing