Refactoring, getting new Architeture
Trying to Avoid Gray Screen