Add raw code, partly working