Work in progress on peak analysis