Finished so far - now testing can be started.