Huge update + must add new resources.