almost everything done

training adding and JIRA remaining..