Organization stuff, and working on validation checks