Commented some stuff out to get a prelim test working