this is a major revamp. i must, i must, i must.