Reindented, beta new stats, ready for demo