FIXED IT! mostly....