Work as a part of the other app, and better stack stuff