App access2

2nd implementation of app access.. 
@Nenad If it's ok for you please merge it