Minor update to Generic_Factory to try and fix problems

The static singleton variable was moved from class scope to the Get_Instance() method, to try and address some issues I was having.

Not sure if this helped.