Few more fns converted. Stopping for now