Added cinnamoncello. Revised calculation math. Still in need of work.