done most of the yaml shit