Started implementing wrapping (Still needs tons of work)