Switch to em for most measurements + minor tweaks
Initial Resume