Version 1.3

done everything except sorting