TODO: LOG + CHANGE TO PACKAGE TYPE