Worked on Lilypads

Cleaned up a bit of code, rearranged where and how some calculations
were being done. Started work on Lilypads, but they are not complete
yet. Most of the work is done on them.