Rewrote code, dropped yaml dependency