Start of sorting out profile vs id problem