Complete rewrite in progress...