Initial check-in - cleaned up