Build fix, still not finished/tested