Added the beginnings of stars, optimized model queries a bit