Uplevel development to production

@sinker, @erikao to review changes