Finishing up id woes