Basically works now, ranking TBD