Shaping this lib a bit