Further solidified class export. Just more testing needed now.