A lot of new class and views. A lot of junk code. Have to clean up. But some things are Working for now!!