Weight tab

Merging everything for the weight tab into master