initial conversion commit. still buggy for sure