Rewrote App with Promises