adding lockable and timeoutable to app