Rearrange to include ability library, again