seems to be semi working now