not that great commit, just diffing
merged conflicts
finished the config file hellride