Issues working fine

Working on comments now.