Dev

fixed the sort. Pull this and run... everything we've worked on so far seems functionally complete, right?