Toast github updates
Move a lot of code around to prepare for combo feeds and stories