Changed the class structure a bit for stackable data.