First quick pass for most of the s01 translation, using it as a test commit