SNII added. Newcontroller runs but have not yet sanity tested.