Starting to kinda feel like it could have a structure .: move into lib