Stage 3 Design Overhaul

Design brought up to functionality standards of original, ready for pull
request. Favorite channels put off for a later fork.