Removed jasming for now, work in branch