Working first pass, need more data and prettification, and feats