Please Note that this is current a mess merge and test branch!