Got rid of the wrap class

Stil feel like I need a better solution though