some progress :)