Finished features, I still need to validate the results ...