Everything working after refactor, PSO w/ GDA still broken