Convert to 'working' gem; pre-gem push prep