add in status and type logic to set currents and create index