Client module changes

This is a test for client module changes
We should really get rid of this