312 Additions

See changes.