More training saber stuff (incomplete, still need if loggedIn to be added in some places)