Refs #15. Base commit