Fixed array declarations. Needs more work