BIG Update, Admin + API
Second part of big update