Second try at making it all work