Commented some stuff out should still work