worked on conversions
Merge branch 'corbin-working'