New version that works with sepereated contexts, but needs some cleaning and a readme update