magoo

hey evan, pull my changes in