Made some changes, still have to change the 'unsafe_access'es