Conversion from BS2 -> BS3, Includes #259, and working mobile stuff