Interface has been updated, everything seems to work. Needs to be properly tested