Some plans on future
TODO's considering last tests