some huge stuff done on app side

lala