Polishing now

Still considering some tweaks to how calories are tracked