Modified app to be JS version