Fix merge conflicts
Virtual is my friend
Working on errors
Moving attribute lists around