Tidy up and include item weights
Test new objectives