Working on more modular design

Removed header, no way to get current channel
Moar changes. Lost changes list to some vestigial git error. Fuckit. Outerspace. Done for the day.