Working on inv stuff