~ Many syntax fixes
~ Most of the conversion to Doctrine