Refactor shcema, have sample data and queries all working