Reformat, start API, remove non working stuff