Fixed build, but commented out big chunks of the old implementation, now implemente on wrapper functions.