Start to add more advanced settings. W.I.P