Potentially more lib and less suck this time around