Continue the phonegap refactor