Flesh things out, add carousel