Big refactor of configs and Messages working