Added health, started constructor modularisation
Fixed merge conflicts