Integration progress

Most tests seem to be working again