Latest changes ( partial implementation, compilable )