Rename, it turns out id's are more complex then first thought
Add comments about possible future refactoring