All Functionality complete except for sorting