More work making the current code mobile-up