Added some. That was fun. :laughing:
fix merge
Merge branch 'dannyfritz-master'