making some progress :D