Mostly done

Only need to add tooltips