beta

let's start making this fun
data updates and reorg for beta