All implementations done, now to testing