Dev freeze staging [DO NOT MERGE]

Just to keep track of everything. Should be ready to merge (hopefully soon)