new ref. needs to be updated a bit.. but it's mostly done