Dev mockups and other cool stuff

use .catch() instead of second function