Switched to Q instead of my half-done promises