Done, moved a TON of logic that belongs there.