A few tweaks... beginning schema