latest changes

yet to work on sorting