Minor memory fix

Probably going to scrap these classes anyway and start from scratch