Updated a lot of stuff at work
merged in work from work
Removed inex_1
App is working.