Master beta 1
Ready to debug