OSCAR-0
Updated to latest snapshot. +review @jbourgeois