Haley - Finally some quality time!

Working on v0.1.2, about 20% of the way there as of today.