More row stuffs
Resolved conflicts
Took out platform generation code so that y'all can test shiz