merge with laptop version- include parsing class, width, etc