Add all of Flipsels' changes!