Add full PSO implmemntation but with hiccups