Add test version of mobile compatibility, refactor