Mega update. Major refactor to make more awesome.