DO NOT MERGE - Feature/remove pointer to struct