Made schema work... sort of