More WIP to update to newest SDK