Basic conversion complete, needs some work