A couple more references and started changing some stuff