not done yet, will update overthe course of an hour