Working on clean up, but code freezing for unknown reason