#50 Initial check in - some minor adjustments to come after preview.