updated
Now keeps track of a channels location
updated to allow tracking of channel location
Several updates