merging from app

testing, alpha