About to break this into two queries

Just wanted to commit to save stuff