Initial Commit for safety mostly