Working version 2, final on cloud

major front bug fix.