first commit
took out ids