Started conversion process,
This conversion will be done over several commits.