attempting to iron out some bugs…