Initial work on integration ( very very dirty )