Worked on more Comm stuff