[WIP] Add some code for checking Commons