Switched to new formatting standards (uploading config soon)