479 468 sortable

dont merge this one yet either! still a WIP